Skip to content

feat(opentelemetry): create otel instrumentation for typed-express-router #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: beta
Choose a base branch
from

Conversation

starfy84
Copy link
Contributor

@starfy84 starfy84 commented Jun 25, 2025

Ticket: DX-1473

This PR implements opentelemetry instrumentation for the decode and sendEncoded calls in wrapRouter.

Changes:

  • typed-express-wrapper
    • @opentelemetry/api@^1.0.0 added as an optional peer dependency
    • @opentelemetry/[email protected] , @opentelemetry/[email protected], and @opentelemetry/[email protected] added as dev dependencies
    • wrapRouter modified to create decode and encode spans if @opentelemetry/api is installed
      • if @opentelemetry/api is not installed, spans are not created
    • onDecodeError option removed. Please use decodeErrorFormatter and getDecodeErrorStatusCode
      • decodeErrorFormatter takes in an array of ValidationErrors and a WrappedRequest, returning a Json object.
      • getDecodeErrorStatusCode takes in an array of ValidationErrors and a WrappedRequest, returning a number.
    • onEncodeError option removed. Please use encodeErrorFormatter and getEncodeErrorStatusCode
      • encodeErrorFormatter takes in an error and a WrappedRequest, returning a Json object.
      • getEncodeErrorStatusCode takes in an error and a WrappedRequest, returning a number.
    • typed-express-router now handles the sending of the http response when there is a decode or encode error
  • express-wrapper
    • routerForApiSpec modified to pass in new parameters decodeErrorFormatter, getDecodeErrorStatusCode, encodeErrorFormatter, and getEncodeErrorStatusCode
      • These new parameters can also be customized by modifying the props passed into the function (see CreateRouterProps)

BREAKING CHANGE: onDecodeError and onEncodeError have been removed. Please use decodeErrorFormatter, getDecodeErrorStatusCode, encodeErrorFormatter, and getEncodeErrorStatusCode

@starfy84 starfy84 self-assigned this Jun 25, 2025
@starfy84 starfy84 force-pushed the DX-1473-create-otel-wrapper-for-typed-express-router branch 2 times, most recently from 9c177cd to 0bff27e Compare June 26, 2025 15:07
@starfy84 starfy84 marked this pull request as ready for review June 26, 2025 15:15
@starfy84 starfy84 requested a review from a team as a code owner June 26, 2025 15:15
@starfy84 starfy84 force-pushed the DX-1473-create-otel-wrapper-for-typed-express-router branch from 43daf20 to 3781856 Compare June 30, 2025 15:38
@ericcrosson-bitgo ericcrosson-bitgo marked this pull request as draft June 30, 2025 20:15
@starfy84 starfy84 force-pushed the DX-1473-create-otel-wrapper-for-typed-express-router branch 4 times, most recently from 6cd264b to 11fc7f0 Compare July 9, 2025 16:24
@starfy84 starfy84 force-pushed the DX-1473-create-otel-wrapper-for-typed-express-router branch from f804fb4 to 0158ca3 Compare July 9, 2025 16:28
@starfy84 starfy84 marked this pull request as ready for review July 9, 2025 16:30
@starfy84 starfy84 changed the base branch from master to beta July 9, 2025 19:55
@ericcrosson-bitgo ericcrosson-bitgo marked this pull request as draft July 10, 2025 21:38
@starfy84 starfy84 force-pushed the DX-1473-create-otel-wrapper-for-typed-express-router branch from a224511 to ab8a123 Compare July 15, 2025 15:19
@starfy84 starfy84 force-pushed the DX-1473-create-otel-wrapper-for-typed-express-router branch from 183d5f4 to 3cfad4e Compare July 17, 2025 18:49
…uter

This commit implements `opentelemetry` instrumentation for the `decode` and `sendEncoded` calls in `wrapRouter`.

Changes:
- `typed-express-wrapper`
  - `@opentelemetry/api@^1.0.0` added as an optional peer dependency
  - `@opentelemetry/[email protected]` , `@opentelemetry/[email protected]`, and `@opentelemetry/[email protected]` added as dev dependencies
  - `wrapRouter` modified to create decode and encode spans if `@opentelemetry/api` is installed
    - if `@opentelemetry/api` is not installed, spans are not created
  - `onDecodeError` option removed. Please use `decodeErrorFormatter` and `getDecodeErrorStatusCode`
    - `decodeErrorFormatter` takes in an array of `ValidationError`s and a `WrappedRequest`, returning a `Json` object.
    - `getDecodeErrorStatusCode` takes in an array of `ValidationError`s and a `WrappedRequest`, returning a number.
  - `onEncodeError` option removed. Please use `encodeErrorFormatter` and `getEncodeErrorStatusCode`
    - `encodeErrorFormatter` takes in an error and a `WrappedRequest`, returning a `Json` object.
    - `getEncodeErrorStatusCode` takes in an error and a `WrappedRequest`, returning a number.
  - `typed-express-router` now handles the sending of the http response when there is a decode or encode error
- `express-wrapper`
  - `routerForApiSpec` modified to pass in new parameters `decodeErrorFormatter`, `getDecodeErrorStatusCode`, `encodeErrorFormatter`, and `getEncodeErrorStatusCode`
    - These new parameters can also be customized by modifying the props passed into the function (see `CreateRouterProps`)

BREAKING CHANGE: `onDecodeError` and `onEncodeError` have been removed. Please use `decodeErrorFormatter`, `getDecodeErrorStatusCode`, `encodeErrorFormatter`, and `getEncodeErrorStatusCode`
@starfy84 starfy84 force-pushed the DX-1473-create-otel-wrapper-for-typed-express-router branch from 3cfad4e to 4248ffd Compare July 17, 2025 18:52
@starfy84 starfy84 marked this pull request as ready for review July 17, 2025 18:59
Copy link
Contributor

@ericcrosson-bitgo ericcrosson-bitgo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently this text box can't be empty.

};

export const onEncodeError: OnEncodeErrorFn = (err, _req, res) => {
export const defaultEncodeErrorFormatter: EncodeErrorFormatterFn = (_err, _req) => {
return {};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: Does this change the behavior of express-wrapper so it sends a JSON body of {}, where previously there was no body?

_req,
) => 400;

export const defaultEncodeErrorFormatter: EncodeErrorFormatterFn = () => ({});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idem

onEncodeError: (_err, _req, res) => {
res.status(500).json('Custom encode error').end();
encodeErrorFormatter: (_err, _req) => {
return 'Custom encode error';
Copy link
Contributor

@ericcrosson-bitgo ericcrosson-bitgo Jul 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: Look at all that data instead of state! 😍

import { createRouter } from '../src';
import assert from 'node:assert';
import { ApiTsAttributes } from '../src/telemetry';
import test, { beforeEach, afterEach } from 'node:test';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quibble: please separate imports into the following sections, with sections separated by a single newline:

  1. Native node imports (begin with node:)
  2. Imports from a named package
  3. Relative imports

Note: Not blocking change, can be done in a follow-up PR.

body?: any,
): Promise<{ statusCode: number; data: string }> => {
return new Promise((resolve, reject) => {
const url = `http://localhost:${(server.address() as any).port}${path}`;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: LSP says server.address() is of type string | AddressInfo | null -- how do you always know it is of type AddressInfo here? I wonder if there's a way to clean up the type cast.

Comment on lines +79 to +93
const GetHello = httpRoute({
path: '/hello/{id}',
method: 'GET',
request: httpRequest({
params: {
id: t.string,
},
}),
response: {
200: t.type({
id: t.string,
}),
},
});

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quibble: Please use the conventional order of GET, POST, PUT, DELETE, PATCH, by moving this GET operation above the PUT operation declared for the same path on line 58.

get: makeAddRoute('get'),
post: makeAddRoute('post'),
put: makeAddRoute('put'),
delete: makeAddRoute('delete'),
patch: makeAddRoute('patch'),

Note: Not a blocking change, can be done in a follow-up PR.

Comment on lines +111 to +112
put: PutHello,
get: GetHello,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quibble: For the same reason as above, please use the order of GET, POST, PUT, DELETE, PATCH

Note: Not a blocking change, can be done in a follow-up PR.

decodeSpan?.attributes?.[ApiTsAttributes.API_TS_PATH],
'/hello/{id}',
);
assert.strictEqual(decodeSpan?.attributes?.[ApiTsAttributes.API_TS_METHOD], 'GET');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shorthand now as we are on a call: please update ordering to match the order keys are introduced in the object definition

Note: Not a blocking change, can be done in a follow-up PR.


// TODO: POST
// TODO: DELETE
// TODO: PATCH
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noting

Comment on lines +360 to +361
// Find encode span
const decodeSpan = spans.find(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noting irregular use of encode/decode

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants